Match character height instead of cell height. Fix #301228.

2005-04-19  Ivan, Wong Yat Cheung  <email@ivanwong.info>

	* gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
	character height instead of cell height. Fix #301228.

diff --git a/ChangeLog b/ChangeLog
index 213a50408a6f816e54a0dca9dff3ec15a29fd0f4..40e7be14875417adb9911db6559c56e89d9e95ec 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2005-04-19  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+       * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
+       character height instead of cell height. Fix #301228.
+
 2005-04-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 213a50408a6f816e54a0dca9dff3ec15a29fd0f4..40e7be14875417adb9911db6559c56e89d9e95ec 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,3 +1,8 @@
+2005-04-19  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+       * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
+       character height instead of cell height. Fix #301228.
+
 2005-04-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 213a50408a6f816e54a0dca9dff3ec15a29fd0f4..40e7be14875417adb9911db6559c56e89d9e95ec 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,3 +1,8 @@
+2005-04-19  Ivan, Wong Yat Cheung  <email@ivanwong.info>
+
+       * gdk/win32/gdkfont-win32.c (gdk_font_load_internal): Match
+       character height instead of cell height. Fix #301228.
+
 2005-04-18  Federico Mena Quintero  <federico@ximian.com>
 
        Merged from gtk-2-6:

diff --git a/gdk/win32/gdkfont-win32.c b/gdk/win32/gdkfont-win32.c
index 2086fe7c8ec3050835da5978cdb038510f9f7c4d..62c4d1021eaa686f4fec65f7d52192e1918425a6 100644 (file)
--- a/gdk/win32/gdkfont-win32.c
+++ b/gdk/win32/gdkfont-win32.c
@@ -1018,9 +1018,9 @@ gdk_font_load_internal (const gchar *font_name)
        if (strcmp (point_size, "*") == 0)
          logfont.lfHeight = 0;
        else
-         logfont.lfHeight = (int) (((double) atoi (point_size))/720.*logpixelsy);
+         logfont.lfHeight = -(int) (((double) atoi (point_size))/720.*logpixelsy);
       else
-       logfont.lfHeight = atoi (pixel_size);
+       logfont.lfHeight = -atoi (pixel_size);
 
       logfont.lfWidth = 0;
       logfont.lfEscapement = 0;